# This is a BitKeeper generated patch for the following project: # Project Name: Linux kernel tree # This patch format is intended for GNU patch command version 2.5 or higher. # This patch includes the following deltas: # ChangeSet 1.884.24.1 -> 1.884.30.1 # Documentation/Configure.help 1.128.13.4 -> 1.128.13.5 # # The following is the BitKeeper ChangeSet Log # -------------------------------------------- # 03/01/03 bjorn_helgaas@hp.com 1.884.24.2 # Merge hp.com:/home/helgaas/bk/ia64-extras # into hp.com:/home/helgaas/bk/linux-ia64-2.4 # -------------------------------------------- # 03/01/03 bjorn_helgaas@hp.com 1.884.23.2 # Merge hp.com:/home/helgaas/bk/to-marcelo-2.4 # into hp.com:/home/helgaas/bk/linux-ia64-2.4 # -------------------------------------------- # 03/01/03 eranian@frankl.hpl.hp.com 1.884.25.1 # ia64: perfmon task pinning fix for system-wide monitoring in SMP systems # -------------------------------------------- # 03/01/03 bjorn_helgaas@hp.com 1.884.25.2 # ia64: Delete all SGI SN defconfig files. # -------------------------------------------- # 03/01/03 bjorn_helgaas@hp.com 1.884.25.3 # ia64: Reverse SGI scatterlist changes so SGI update will apply. # -------------------------------------------- # 03/01/03 jh@sgi.com 1.884.25.4 # ia64: Update SGI SN files # # Below is a patch that updates the SGI SN files. # You still won't be able to compile, though, as we're # completely dependent on the discontig patch. # -------------------------------------------- # 03/01/05 yoshfuji@linux-ipv6.org 1.884.26.1 # [IPV6]: Fix Length of Authentication Extension Header. # -------------------------------------------- # 03/01/06 marcelo@freak.distro.conectiva 1.884.1.70 # Merge bk://kernel.bkbits.net/davem/net-2.4 # into freak.distro.conectiva:/home/marcelo/bk/linux-2.4 # -------------------------------------------- # 03/01/06 alan@lxorguk.ukuu.org.uk 1.884.1.71 # [PATCH] PATCH: bring APM up to date # # This fixes some nasties like the power off hang on the AMD76x boxes, as # well as supporting APM on SMP on a few boxes (YMMV) # -------------------------------------------- # 03/01/06 marcelo@freak.distro.conectiva 1.884.1.72 # Add removepage callback # -------------------------------------------- # 03/01/06 marcelo@freak.distro.conectiva 1.884.1.73 # Merge bk://linux-bt.bkbits.net/bt-2.4 # into freak.distro.conectiva:/home/marcelo/bk/linux-2.4 # -------------------------------------------- # 03/01/06 bjorn_helgaas@hp.com 1.884.1.74 # [PATCH] Fix CPU bitmask truncation (2 of 2) # # This does not make a functional difference, so ignore it if you # like. Two reasons you might want it: # # 1) It's in 2.5.x, so you might want it for consistency. # 2) Comments in sched.h refer to cpus_runnable being ~0 # if the process is not running on any CPU. # -------------------------------------------- # 03/01/06 marcelo@freak.distro.conectiva 1.884.1.75 # Cset exclude: alan@lxorguk.ukuu.org.uk|ChangeSet|20030102230329|26122 "add hwclock ioctls" # -------------------------------------------- # 03/01/06 alan@lxorguk.ukuu.org.uk 1.884.1.76 # [PATCH] PATCH: Fix the "controller but no drives" IDE problem # # People seeing IDE controllers detected but no disks can you try the # following backport of Ivan's 2.5 PCI fix # -------------------------------------------- # 03/01/06 alan@lxorguk.ukuu.org.uk 1.884.1.77 # [PATCH] PATCH: trivial ide oddments # -------------------------------------------- # 03/01/06 sailer@scs.ch 1.884.1.78 # [PATCH] Fix oopsable bug in OSS PCI sound drivers # # The following patch fixes an oopsable (according to a few reports) bug # in the multiple open exclusion logic in my sound drivers and a driver # derived from my code. Please apply. # # Tom # -------------------------------------------- # 03/01/06 akpm@digeo.com 1.884.1.79 # [PATCH] fix buffer_head.b_state race # # set_buffer_attached() must use an atomic operation. Otherwise it will trash # modifications to b_state which were made by other CPUs. # # # include/linux/fs.h | 2 +- # 1 files changed, 1 insertion(+), 1 deletion(-) # -------------------------------------------- # 03/01/06 mikpe@csd.uu.se 1.884.1.80 # [PATCH] Fix ide-scsi ref count bug in 2.4.20-pre2 # # This bug affects modular ide-scsi in 2.4.20-ac2 and 2.4.21-pre2. # Inserting the ide-scsi module and letting it control an odd number # of drives, and then rmmod:ing ide-scsi, results in the following: # # (after inserting ide-scsi; hdc is my CD writer) # scsi0 : SCSI host adapter emulation for IDE ATAPI devices # Vendor: PHILIPS Model: CDRW2412A Rev: P1.5 # Type: CD-ROM ANSI SCSI revision: 02 # # (after rmmod ide-scsi) # scsi : 0 hosts left. # idescsi_cleanup: hdc: failed to unregister! # hdc: usage 0, busy 0, driver d08a00e0, Dbusy 1 # hdc: exit_idescsi_module() called while still busy # # Rebooting after this then triggers an oops in ide.c:ide_notify_reboot()'s # call to DRIVER(drive)->cleanup(drive), since DRIVER(drive) [hdc] still # points to the idescsi_driver structure in the unloaded ide-scsi module. # # It turns out that there is a long-standing reference counting bug # in all versions of ide-scsi in current 2.2/2.4/2.5 kernels: ide-scsi # abuses DRIVER(drive)->busy as an integer counter when in fact ->busy # is only a 1-bit field. # # In 2.4.20-ac2/2.4.21-pre2, idescsi_driver.busy is zero after init # because idescsi_setup() does one ++ and one -- for each drive. # At "rmmod ide-scsi", idescsi_release() does a DRIVER(drive)->busy-- # on each ide-scsi drive. Since they all point to the same idescsi_driver, # idescsi_driver.busy is decremented to -(number of drives) % 2. # With an odd number of ide-scsi drives, the driver is marked busy, # idescsi_cleanup() fails to clean up, and ide_notify_reboot() oopses. # # ide-scsi.c in other kernels (2.2, 2.4 before 20-ac2/21-pre2, 2.5) also # abuses DRIVER(drive)->busy, but there it has two complementary bugs # that cancel each other. idescsi_setup() increments ->busy for each # ide-scsi drive, and idescsi_release() decrements ->busy for each drive. # busy equals (number of drives) % 2 while ide-scsi is loaded, but is # zero as the module is being removed. ide-scsi unloads cleanly, but ->busy # clearly incorrect and useless. # # The patch below applies to 2.4.20-ac2 and 2.4.21-pre2. It's a minimal # fix: instead of decrementing busy, idescsi_release() sets busy to zero # since that's the only valid value at this point. Tested & works for me. # # Long-term, someone needs to decide whether idescsi_release() really # needs to loop over all drives. They all point to idescsi_driver, so # a single "idescsi_driver.busy = 0;" should suffice. # # /Mikael # -------------------------------------------- # 03/01/06 adilger@clusterfs.com 1.884.1.81 # [PATCH] 2.4 ext3 ino_t removal # # This patch against 2.4.21-pre2 removes my erronous use of ino_t in a # couple of places in the ext3 code. This has been replaced with unsigned # long (the same as is used for inode->i_ino). This quiets a bunch of # warnings on ia64 compiles, and also replaces a couple of %ld with %lu # to forestall output wierdness with filesystems with a few billion inodes. # # Cheers, Andreas # ======================= ext3-2.4-ino_t.diff =============================== # -------------------------------------------- # 03/01/06 marcelo@freak.distro.conectiva 1.884.1.82 # Changed EXTRAVERSION to -pre3 # -------------------------------------------- # 03/01/06 trini@kernel.crashing.org 1.884.27.1 # PPC32: Change the MPC8xx IRQ code so that things are arranged # like other systems. # -------------------------------------------- # 03/01/06 trini@kernel.crashing.org 1.884.27.2 # PPC32: Enable PCMCIA and a tested wifi card on some MPC8xx targets. # -------------------------------------------- # 03/01/06 bero@arklinux.org 1.884.1.83 # [PATCH] AGP support for VIA P4X333 boards # # The patch adds AGP support for VIA P4X333 mainboards [by simply adding the # PCI IDs, the generic VIA driver works]. # -------------------------------------------- # 03/01/06 petkan@rakia.hell.org 1.884.10.21 # [PATCH] USB pegasus update # # set mac address at dev->open() time as per the standard; # missing flag added to Linksys USB10T; # -------------------------------------------- # 03/01/06 petkan@rakia.hell.org 1.884.10.22 # [PATCH] USB rtl8150 update # # set mac address at dev->open() time; # -------------------------------------------- # 03/01/06 petkan@rakia.hell.org 1.884.10.23 # [PATCH] Petkan's email address change # # email address change # -------------------------------------------- # 03/01/06 oliver@oenone.homelinux.org 1.884.10.24 # [PATCH] USB kaweth bugfix # # - correct freeing of skbs # -------------------------------------------- # 03/01/06 henning@meier-geinitz.de 1.884.10.25 # [PATCH] scanner.c: fix race in ioctl_scanner() # # This patch adds locking to ioctl_scanner() which was completely # lacking until now. The patch is originally from Oliver Neukum # . # -------------------------------------------- # 03/01/06 henning@meier-geinitz.de 1.884.10.26 # [PATCH] USB scanner driver: updated documentation # # This patch updates the documentation for the USB scanner driver. The # details: # # Documentation/usb/scanner.txt: # - Added information about read_timeout # - Added more details about /proc/bus/usb/devices # - Added/updated links # - Added pointers two "special" scanner drivers # - Reordering, spell-checking, formatting # - Used /dev/usb/scanner[0-15] instead of /dev/usbscanner[0-15] # - Removed some basic USB configuration stuff # - Added EHCI # - Removed some more references to HP # # Documentation/usb/scanner-hp-sane.txt: # Removed completely. This was a very outdated text for some HP # scanners. All of this is explained in the documentation of the # user-space SANE tools. Links and a short explanation about SANE was # added to scanner.txt instead. # -------------------------------------------- # 03/01/06 mark@alpha.dyndns.org 1.884.10.27 # [PATCH] USB ov511: Convert to new V4L 1 interface # # Here's a patch to switch ov511 over to the new V4L 1 interface # introduced in 2.4.19. Rather than storing the function pointers for # open(), ioctl(), etc in struct video_device, I just hand the V4L layer a # struct file_operations. # # The advantages of this are: # # - The driver more closely resembles its 2.5 counterpart. # # - Multiple simultaneous opens will eventually be possible. # # - The old interfaces required calling video_unregister_device() from # close() if the device was unplugged while open, causing a deadlock in # the V4L layer. Now we just call video_unregister_device() # unconditionally from disconnect(). (Credit goes to Duncan Haldane for # tracking that bug down) # # This is just a backport of the changes made to the driver in ~2.5.10; # nothing new here. I've been using this version of the code under 2.4 for # months and it works well. # -------------------------------------------- # 03/01/06 greg@kroah.com 1.884.28.1 # Merge kroah.com:/home/greg/linux/BK/bleeding_edge-2.4 # into kroah.com:/home/greg/linux/BK/gregkh-2.4 # -------------------------------------------- # 03/01/06 marcelo@freak.distro.conectiva 1.884.1.84 # Merge bk://linuxusb.bkbits.net/marcelo-2.4 # into freak.distro.conectiva:/home/marcelo/bk/linux-2.4 # -------------------------------------------- # 03/01/06 jgarzik@redhat.com 1.884.29.1 # Merge redhat.com:/home/jgarzik/repo/marcelo-2.4 # into redhat.com:/home/jgarzik/repo/net-drivers-2.4 # -------------------------------------------- # 03/01/06 marcelo@freak.distro.conectiva 1.884.1.85 # Merge bk://kernel.bkbits.net/jgarzik/net-drivers-2.4 # into freak.distro.conectiva:/home/marcelo/bk/linux-2.4 # -------------------------------------------- # 03/01/06 marcelo@freak.distro.conectiva 1.884.1.86 # Fix typo in Apollo P4X400 support patch # -------------------------------------------- # 03/01/06 marcelo@freak.distro.conectiva 1.884.1.87 # Revert broken drivers/ieee1394/Makefile changes # -------------------------------------------- # 03/01/06 david-b@pacbell.net 1.884.28.2 # [PATCH] zaurus B500 (sl-5600?) & usbnet # # More Zaurii. That model will be interesting from the # perspective of "usb gadget drivers", lots of flexible # endpoints are available. # -------------------------------------------- # 03/01/06 bjorn_helgaas@hp.com 1.884.30.1 # ia64: Update processor type descriptions. CONFIG_ITANIUM is # explicitly the "generic" type. # -------------------------------------------- # diff -Nru a/Documentation/Configure.help b/Documentation/Configure.help --- a/Documentation/Configure.help Wed Oct 8 09:06:49 2003 +++ b/Documentation/Configure.help Wed Oct 8 09:06:49 2003 @@ -25589,11 +25589,13 @@ # Choice: ia64type Itanium CONFIG_ITANIUM - Select your IA64 processor type. The default is Intel Itanium. + Select your IA-64 processor type. The default is Intel Itanium. + This choice is safe for all IA-64 systems, but may not perform + optimally on systems with, say, Itanium 2 or newer processors. -McKinley +Itanium 2 CONFIG_MCKINLEY - Select this to configure for a McKinley processor. + Select this to configure for an Itanium 2 (McKinley) processor. # Choice: ia64system IA-64 system type